From 63651553568616719f7e4d0e4b0f777907943178 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 9 Aug 2020 14:42:54 +0100 Subject: [PATCH] d/tests: Only test under X11 for now --- debian/tests/build | 4 ++++ debian/tests/installed-tests | 4 ++++ debian/tests/installed-tests-flaky | 4 ++++ debian/tests/python3-gi | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/debian/tests/build b/debian/tests/build index 50749ba387..c99c2e4d41 100755 --- a/debian/tests/build +++ b/debian/tests/build @@ -11,6 +11,10 @@ set -e set -u set -x +# We don't test under Wayland yet, because we don't have a Wayland +# equivalent of xvfb-run +export GDK_BACKEND=x11 + WORKDIR=$(mktemp -d) cleanup () { rm -fr "$WORKDIR" diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests index 694b6e3df9..126cabba91 100755 --- a/debian/tests/installed-tests +++ b/debian/tests/installed-tests @@ -11,6 +11,10 @@ export GIO_USE_VOLUME_MONITOR=unix export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP" +# We don't test under Wayland yet, because we don't have a Wayland +# equivalent of xvfb-run +export GDK_BACKEND=x11 + tests=$(gnome-desktop-testing-runner -l gtk-4.0 | cut -f1 -d' ' | grep -v '^gtk-4.0/a11y/children.test$' | diff --git a/debian/tests/installed-tests-flaky b/debian/tests/installed-tests-flaky index 6e90185d27..94e127e711 100755 --- a/debian/tests/installed-tests-flaky +++ b/debian/tests/installed-tests-flaky @@ -11,6 +11,10 @@ export GIO_USE_VOLUME_MONITOR=unix export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP" +# We don't test under Wayland yet, because we don't have a Wayland +# equivalent of xvfb-run +export GDK_BACKEND=x11 + exec dbus-run-session -- \ xvfb-run -a -s "-screen 0 1024x768x24" \ debian/run-with-locales \ diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi index 85a914c46b..437346d6ba 100755 --- a/debian/tests/python3-gi +++ b/debian/tests/python3-gi @@ -1,5 +1,9 @@ #!/bin/sh +# We don't test under Wayland yet, because we don't have a Wayland +# equivalent of xvfb-run +export GDK_BACKEND=x11 + xvfb-run -a -s "-screen 0 1024x768x24" \ python3 <